Fork of Field Group to fix issue #1557258