Merge branch 'sg/make-fix-ar-invocation' into maint