prepare for merge into badger