Merge "Hot-fix for mismatching lens from database"