#1028: #1027 + #1011: fig and mark updates
opened by njr2128