updates for 3.28 missing in last commit