Merge "bug fix: output colorformat configuration fixed am: 56906949cc  -s ours am: 86995ef4e4  -s ours" into oc-mr1-dev