DRRPP: partial merge from Michael, fix CSS issue. CSN: more prepop