Cherry Pick to Master - Fix for Bug3644