arc conversion
Merge branch 'arc' into develop