Final changes for 2.0.5 release