Fixes map conflict issue.
Merge branch 'master' into shehryar