Merge in relevant changes from CERA-Oracle to HNWebCore-MDB2.