merge from bede fork