Merge "Fix missing function MapNotNull" into sc-dev