Merged upstream into quickfixes