use convention
Merge branch 'loop-support' into additional-options