Merge "change manifest for smack"