unfinished work pre-merge/rebase
resync