remaining updates from upstream repo