New branch

Get commits from new_branch into master