Merge "Fix arc positioning" into nyc-dev