Merge "Fix failing functional test due to class name mismatch." into main