#1819: #1815: rendering improvements

opened by thuchacz