Merge "getIfaceNameFromMap - better type safety" into main