Merge "sanity stabilization" into release-1.1.0