[0.9.4-dev] many fixes and CS
cd[0.9.4-dev] CS