Updated packages
Merge branch 'master' into condense
Update