Merge "Use ArrayMap instead of HashMap in transitions"