Work on ARI so it can limp along in 12
Merge branch 'release/12.0' into develop