Merge branch 'sg/name-rev-wo-recursion'