Merge "composer: 2.4: vts: do not try to delay a config change outside a group" into sc-dev