Merge "Update APF VTS for VSR-14 compliance" into main