update fork to latest merges

update fork with latest merges