LRDCOM-8964: Metadata commit (reverse-merged from commit 6abf9291a1e115039989a1efbd3d332f100262cb)
LRDCOM-8964