Merge "Improve Patrole config options"