nyacc: merge from 0.76.4