Changes update6 to work with lens-4.0.*