Merge in CPOR priv/pub and refinements to MAC-PDP code