Merge contract commits from master