#1733: #1732: implemented changes fols 9v, 54v-75v per NJR, CC, THU

opened by thuchacz