intelli_plug: merged scheduler patches for intelli plug - v3.7