sync CHANGES for 0.9.3