Merge branch '16.11.x' into 17.05.x