Update for 2016.11.2