Add env control + remove wrong recursive call check (TODO: enhance the recovery from landmark failure)
Add env control + remove wrong recursive call check (TODO: enhance the recovery from landmark failure)

mlasson/landmarks,LexiFi/landmarks