Fixing the builds. Re #7369.
Merge branch 'feature/7369_convolution_fit' into develop