refresh the Changes

I cherry-picked commit:fc2deec53c1c47b33886db5be4274260a238e186
from master