base:master upstream changes