I want the merge in the feature branch because I want to ensure we're
using the same mechanism for custom code etc