All changes from gs:master