Merge "Fix path position in BakedOpDispatcher"