Master branch uses old EMP branch

EMP branch is still feature/lpgbtv1_merge_rebase