LUN-819 -- some optimizations