Merge "Update panel top corners" into main