[ADD] Cherry pick the changes in 0.69.3 back to develop branch

Heimdallrequested to merge
1130-issue-dev into develop

revert changes in 20b09fe7 as this change made the encrypt / decrypt super slow

Related to #1130 (closed)

Merge request reports