Mostly stable build

see flash-cml comment