Added work for BIRD-68