Merge changes I6c5e8c8b,I3642995e,Id281c732 into main

* changes:
  Remove allocator from composer2.1-4 VTS
  Remove mapper from composer2.1 VTS
  Remove mapper from composer2.2 VTS