Engineering merge.
Merge pull request #3515 from Zuhayr/master

Engineering merge.