Merge branch 'master' into gcl_cleanup