Merge "Remove direct mapper from composer2.4 VTS" into main