[TASK] further steps towards 2.0.0
[TASK] further steps towards 2.0.0