UI bits for ALV-332
Merge remote-tracking branch 'origin/master'