updates from 18.11 mid-class