merge revision(s) 9459bedd84d479bb1d7d3d40bada1cecb4701c37: [Backport #19841]
[Bug #19841] Refine error on marshaling recursive USERDEF
merge revision(s) 9459bedd84d479bb1d7d3d40bada1cecb4701c37: [Backport #19841]