CORE-4812: Preventing user from launching app with no tool
Merge branch 'master' into STABLE