COMMONS-190: merget master into feature branch