Fixing merge conflict with BIRD-64
Completed merge of BIRD-64