Merge pull request #4552 from giant-rabbit/preprocess-hook