#1731: #1730: implemented rendering changes identified by NJR, CC, and THU

opened by thuchacz