intelli_plug: merged with last N5 changes - v3.7