Merge branch 'master' into bugfix/gh_issue_2503