Merge branch 'feature/update-to-2.7' into 'master' See merge request [!1] [!1]: Nonedune-course/iwr-course-2020/merge_requests/1