Correctly handle the accordion fields during the version 3.1 update (see #6229)