Merge branch 'master' into rm_hook