Merge branch 'versioning_history_issue_1189' of github.com:schiesbn/core into versioning_history_issue_1189