Cleaned up manifest
Merge branch 'New-Feature-X'