2.7.1 - adds lazyload bypass