Merge fields in with source if they are present
Merge branch 'merge-fields'