Revert "Merge branch 'development' into 'master'" This reverts merge request !427 See merge request !428