Renaming to resolve ambiguities.
Merge branch 'master' into dev