#1885: #1469 + #1882: 159r_3
opened by njr2128