Merge long running branch into master