Merge remote-tracking branch 'origin/master' into feature/settings
COMMONS-195 rename the API packages
Merge remote-tracking branch 'origin/feature/settings' into feature/settings