WIP
Updated from latest BZR
Various local changes