WIP: updates for 4.6.0f1