WIP
Updated from latest BZR