Merge "Single user headless DO fixes" into main