Merge branch 'minor-structure-changes' into 'master'