ICSE camera-ready