Merge "Prevent execution of locally overridden core modules" into feature/zuulv3