Don't indef IPs when AB is triggered
Merge remote-tracking branch 'upstream/master'