repair shortcircuited mp reads
use better iterator for m_shortCircuitReads
Merge branch 'master' into optimize-null-checking