Fix #614
Perparing 6.0.0 beta1