Merge bt branch from elupus