Merge pull request #7536 from valeriosetti/issue7480-backport

Backport: Fix test gap in PK write: private (opaque) -> public