bring codebase up-to-date

up-to-date with downstream fork