Merge "Strip +1 when subscribing to VVM3"