Update update manifest
Merge branch 'update'