Revert "Merge branch '23.0-MP-SW-default' into '23.0'" This reverts commit f2d9c688, reversing changes made to 506517f7.