First part of main-pc update from main. Two merges included:
This brings main-pc up-to-date with commit 0f6d8180.