Merge remote-tracking branch 'origin/develop-63-ctm-output-formats' into develop-63-ctm-output-formats