Merge branch '2017.11' into 2017.11-develop