Changes done for MAGNOLIA-3353 (and its subtasks) on one hand unbend the original breaks, on the other logs an useless error for the extends=override use case since the if/else branch for it is never reached because the previous two branches serve it all. It doesn't (or shouldn't) break the functionality itself as the extending=false; is set anyway.

To fix it just change the ordering - move EXTENDING_NODE_DATA_OVERRIDE.equals(extendedNode) condition prior to the above one, or maybe even at the beginning.