#master: rempl upgraded