Merge "[SO] Support root secret for external DB"