Merging changes on master to 1.8.6-p383
Revert "Merging changes on master to 1.8.6-p383"

This reverts commit dd2980d26c3498bb7c8d8a97b45f06a3f615face.