[BUGFIX] Fix regression when added pid property support in Content object

Change-Id: I02253c660c4a0d358f5216d612b52bf1041c6603
Releases: 0.4.0
Resolves: #59194
Resolves: #59200