Merged SVN 51509