Pre/Post hook changes See merge request !216
mentioned in commit 45b93576
mentioned in merge request !226 (merged)