Fix unstable build - do not merge it in stable