Merge commit 'df65b60ce33e5a56815864f8f0713e25378fa649' * commit 'df65b60ce33e5a56815864f8f0713e25378fa649': Only report "unknown metadata" once per restore helper