Checkpoints moved inside not null check for preventing NPE's for recovered tasks
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
Code cleanup
Merge remote-tracking branch 'origin/develop' into develop