Merge branch 'launchpad-333386' into release