Merge "auto-roam initial implementation"