Revert "Revert "[Merge] From Unstable""

This reverts commit ca555288254d94699ca8cfc3c970e33da1341e7d.