Merge "Color Option Mapping Correction" into tm-qpr-dev