Added walk fn option.
Merge branch 'test' into dev