INTEG-343 catch the case missing resource exception
Merge branch 'master' into feature/stabilization
Merge commit '0e9a8209114972337d4808fedaff6c97cca4b4aa' into HEAD