Merge branch 'main' into float-1342-proper-flush-in-sr