Merge branch 'rnou/315-lstat-inf-loop-on-resolve_new' into 'master'

Resolve "lstat inf loop on resolve_new"

Closes #315

Closes #315

See merge request !209