Pulling @chopachoms post-hook work into rebase