Update fork with commits from main repo, to prepare for merge