updated interfaces from master/v2p4p1 branches