LENS-89 patch applied
LENS-94 WIP patch applied