Update emp-fwk to master branch

Merge request to track changes in downstream repository required for the addition of lpGBT support in the master branch of EMP. Should not be merged until the upstream merge has been completed and tested thoroughly