[RJA-2906][feature] - Merge OG changes

Process MapExpression as well