Bookkeeping: Merge commit '9e2a0e4' into next
This synchronizes merge commits between master and next.