Merge "Start as non-root" into frankfurt