Added in API changes apparently missed in the last merge.  This brings in modifications from R164 and R165 from the mbm_API_changes branch.