Commit in preparation for update merge