Merge "Update MDX mapping" into pi-dev