performance optimizations
Merge commit '3bef1fe'