#1392: #984: 30r thru 36r

opened by thuchacz