Merge branch 'csshooks'