Prepare for release.
Removed redundant manifest entries.
Build fix.
Merge