Merge branch 'pending' into master-pending