Merge "Replace HashMap with ArrayMap for better performance" into main