[5.x] Fix blueprint override logic

[5.x] Fix blueprint override logic #23362