Fixes #15308 - Override validation doesn't run without changes
(cherry picked from commit 85c9be5a6ed9b593214cf3bc9de2f29960a2a25a)
Fixes #15308 - Override validation doesn't run without changes
(cherry picked from commit 85c9be5a6ed9b593214cf3bc9de2f29960a2a25a)