roll up to cs version 1.4.2