Revert "Merging changes on master to 1.8.6-p383"

This reverts commit a8a5cbd0be36773713eb2f86b23737045d418ff7.