Code

Merge branch 'sg/maint-intrebase-msghook' into maint