Add cutoff for changes in 2.16 release