Initial commit of BIRD-32 branch