Re #10836 Simplified update_defaults_from_instrument and it works

much simple and better then the previous complex solution