Fix commit 421da2c0cf1844b2efc5935e868db92141f17489 for build on nevis
Merge remote-tracking branch 'cool-cst-next/cst-next'
fix commit e964a137634eb55777f5e16c7dd2ec1db204cef4