Merge branch 'various-1' into 'master'