Merge remote-tracking branch 'jlentfer/igmpproxy' into next