pull changes from apache cb