Add support to turn off [master*] functionality