Merge "[CVP] Better handling of offline minion situation for cvp methods"