[#11474] Update Features to fix field order