fixed problems with content repository deployment
Merge remote-tracking branch 'origin/develop' into develop