Add preliminary MAP-E FMR patch