Fetch and checkin merge commit

this PR is based on the UpdateRef branch, so should be merged after...