Merge my shaper changes with latest ermal changes