Switch next tick to setImmediate
Merge branch 'feature/setimmediate' into develop