Merge commit '5682060' (Oct 15) into release-queue-1