Done in all of GSG except "Using PS interactively" which is still pending a gerrit review before being merged back into repo.
Also fixed in "Using PS interactively". Merged.