[5.x] Fix blueprint override logic, pt 2

[5.x] Fix blueprint override logic, pt 2 #1924