CORE-4812: Added error message
Merge branch 'master' into STABLE