DS build: Revert only overridden features.
Merge pull request #3290 from sergii-tkachenko/ds-build-soft-features-revert

DS build: Revert only overridden features.
Pull in Neue 5.2.x.
Merge pull request #3291 from DFurnes/neue-5.2.x

Pull in Neue 5.2.x.