Merge branch 'master' into interface_cleanup