Merge pull request #23574 from dmatej/issue-23571-manifests-reduced

Issue 23571 Fixed invalid manifests