Merge pull request #5032 from AndersHoglund/vtx_cntrol_ts