Micro-optimizations
Merge branch '4.1'