Merge "Revert^2 "Address frozen notification API feedback"" into main