Merge branch 'priv-startup'