Merge the latest stable to master

These change is intended to overwrite files in the master branch