Merge branch '2016.11-develop' into 2017.02