Merge branch 'rs/update-hook-optim' into maint