Do not stop Allways On project if close
IDEX-706; IDEX-811: merge with master