[Hotfix] Prevent endless loop
Merge branch 'test' into develop