Merge branch 'cr/remote-update-v'