Merge branch 'fix-field-insert'