Updates & Consolidations

Consolidated a few things between the PRC and CMCD branches from local
files. Also included some feature extensions that I had used on YES.

Updated HM/CMB to most recent master.