Merge "Revert "Remove unnecessary metadata duplication in Script*.""