Merge rebuild branch into master