merge for 0.9.4 release