Hopefully fixing #4905 #4937
Merge branch 'master' into develop
Adding missing exception class