Merge branch 'privsep'