Don't display border by nicer way.
Merge branch 'ut2' into purp