Merge "Refactored BS settings into Policy subclass."