Revert "Fix unstable build - do not merge it in stable"

This reverts commit 2835b005b58994c743e88e332c0582b1dd5a75d0.