merge: fix for DPORT class