Merge branches 'new_branch_name' and 'master' into new_branch_name