TODO changes for next release