Updates to persist the derived field in the field picker box
Updates to persist the derived field in the field picker box after testing
Updates to persist the derived field in the field picker box with grunt
merge