LRDCOM-11860: Metadata update
LPS-50220 Fix for 6120