Merge branch from Albert including SSH gateway