[TASK] Some code clean up

Change-Id: I3ed3ef816bd7c42ce4fd9f6f6e0b8019bef0a2ca
Releases: 0.7.0
Resolves: #63076
[BUGFIX] Resolve value for "select" and "radio" fields in the Content object

Change-Id: I86ef85ff64cfd1456493e2d782870d9566473592
Releases: 0.7.0
Resolves: #63077