Merge "SPM packaging metadata"