Merge branch 'pending' into main-pending