Merge branch 'master' into test_submission_views_365