Fixed MF stuff.
Added comparison for native end points.
Authored by: crowbar27 2017-10-20
Parent: [r915]
Child: [r917]