This branch contains the same source code as CE3-5.1 (based on BMS-2.0.1) + clean up to be inline with VTM2.2.