This reverts commit 106b1418bc. Restores the commits lost during the revert of a merge on staging-next.
106b1418bc