Applay mainstream patches
Merge branch 'master' into hoock_instance_sensitive