Merge "Updates for DFC and prepare for pmmapper"