#master: 2.6.3, layout fix