Finished and tested all 2.16.x