Fixed #349: Performance improvement for loops creation/supression
Fixed #350
Merge remote-tracking branch 'origin/feature/loop' into develop