Merged codes with app scan + lexevs fix
tagged