Merge "Address frozen notification API feedback" into main