bulk merge of current "devo" branch