performance help.
Merge commit '0fa9dec'