update manifest
Merge branch '0.5'