merge from https://github.com/kbc-developers