Merge "Fix mismatch error due to map in python3"