Merge pull request #7449 from amaiorano/fix-extensions-combo-update-on-reset-defaults Fix extensions combo update on reset defaults
