Merge "Do not check active socket from other callbacks" into main