reapply relevant parts of r20164, 20177, 20226