Merge latest bleeding-edge into @RamRS cosmetic-changes