[stateheader] make stateheader more user friendly (related to #3597030) [applied]