Merge "OMS: add TEST_MAPPING" into qt-dev