upstream update

just done merging all upstream updates into the repo