Propagate #16 and #17 updates