Merge "TEST_MAPPING: fix syntax of TODO tag" into main