Merge branch 'patches/proposed/foamDict'