#11 #13 Passive scan option
#11 #13 Revert