Merge branch 'bs/maint-pre-commit-hook-sample' into maint