commit draft of 3.9