Import Fix for Live Release
Merge remote-tracking branch 'origin/release-1-2' into release-1-2