[MOD-1575]  Merging master into stable