Merge changes from topic "fix-b-36733185-vx-in-vts"

* changes:
  Add "VTS" mode to APM Serializer
  APM: Fix config de-serialization