wip 3.6.0