yet more changes to fix confidentiality.data.variety
Merge branch 'issue1107-again'