prepare for merge into main repo