LPS-35371 Duplicated metadata controls