BRANCH iss53 C1
BRANCH iss53 C2
MERGE master and hotfix with iss53