JFormOption

This is the same as #1192 but for staging instead of master.