Merge changes Ie5019f56,Id018a5f5