Fixed OConcurrentModificationException during creation self-loop
(cherry picked from commit 914fc6d)
Merge remote-tracking branch 'nuvolabase/develop' into develop