merge from bbcfutils