WP-2444: update the accordion field collection and fpp.