Merge branch 'hot-fix-leave-application'