IDEADEV-41384 fixed & multiple tasks issue