re #7466 Added once only default change code
Merge remote-tracking branch 'origin/feature/7466_Change_confirmation_defaults'