Initial patch sync with April 6 snapshot
post-April 6 arm fixes