Merge "Remove TEST_MAPPING due to AJUR filter behavior"