Merge branch 'rs/pending' into next