dnn-3461 Resolve Extension Conflicts (partial working)