Maint/master/api cleanup rollup from 16x