LRDCOM-8964: Metadata commit (reverse-merged from commit de1383272af0bcf48427010fa4b53e33ea48fe40)
LRDCOM-8964