Before rebasing to the latest master