2.5 branch. 85% high water mark change to the best-practices file.