Updates throughout, for 28 May releases for command-line install
Updates throughout, for 28 May releases for command-line install