UI changes from master


Differs:

UI fixtures that have been modified: None!