am 131bcb0f: Merge "Revert "Remove unnecessary metadata duplication in Script*.""

* commit '131bcb0ff83cba14d18682ad940ac9999b40ab03':
  Revert "Remove unnecessary metadata duplication in Script*."