Merge branch 'allnamesfirst' into 'master'