Fixed broken merge from 1.5_maintenance

- missed manifests and features
3 files changed