merged upstream changes for trusty