ATEAM-814: Shallow Decoration Fix, 21.2 branch (2022.02.21.)
This is a twin of !50643 (merged), fixing ATEAM-814. (See the JIRA ticket and the MR into master for further details.)
As in !50643 (merged), let's do a full-unit-tests on this MR as well.