Missed a few changes
Merge pull request #2104 from ussuri/enabled-disabled-for-spark-button

Missed a few changes
Minor fix
Merge pull request #2105 from ussuri/sort-out-tabbing-order

Minor fix
Merge remote-tracking branch 'upstream/master' into new-ui-button
Switch to a more standard place to handle/set initial attribute values