Merge commit 'e146d824785078fed578f88b11ff47a7390d27c5' * commit 'e146d824785078fed578f88b11ff47a7390d27c5': Fix bugs 1827027, 1808979, 1820700.
Merge commit 'e146d824785078fed578f88b11ff47a7390d27c5' * commit 'e146d824785078fed578f88b11ff47a7390d27c5': Fix bugs 1827027, 1808979, 1820700.