Merge branch 'as/pre-push-hook'