Merge "Moved "nowait:" key code to PoolCounter in core"