* commit '88bc9753c30c9ab3c92d074ae49520cfa2258b16': DO NOT MERGE Use ArrayMap instead of HashMap for storing relavant nodes