[WIP] prepare for RC1