Merge "composer: 2.4: VTS using old value for parameter" into rvc-dev