version 2.6
checkin 66e38e4