Preparing 2.04 release