16 Commit (feature/spm-packaging-meta)