Revert "Merging changes on master to 1.8.6-p383"

This reverts commit 27039763e17378a7cfc1b53b316200c009335b76.