Second part of fixes related to nested descr function

Related: PRODX-52357
Change-Id: I14db52302923714472af51bee941225639213503
1 file changed