PR of initial master commits

Should the counter be emitted as a param here? OR perhaps the whole instance as is done for AsyncTimeout?