backport
ready with landmark stats
merge