Merge "Tempest config options for security complaince"