Merge "Handle nullptr from mapMemory properly" into oc-dr1-dev