Merge "Move BakedOpDispatcher to separate file"