Merge "[test] TEST_MAPPING for incremental service" into sc-dev