Merge branch 'private-data' into 'master'