merging bluebird branch