(1.1.5) - optimizations made for performance reasons

https://postmedia.tpondemand.com/entity/2664