Z-index correction.
Merge remote-tracking branch 'origin/master' into UI