Merge "SF: fix metadata blob copy" into tm-dev