Reviewed r/1606, r/1644, and r/1646