Merge "Update shadow class method name" into main