New upstream changes of abc