Merge "Remove oxm fetching logic from data-router"