Merge "Add better logging for override test case." into main