diff --git a/firebird-driver.conf b/firebird-driver.conf
index 730c32cf..1fc2c4a3 100644
--- a/firebird-driver.conf
+++ b/firebird-driver.conf
@@ -1,231 +1,246 @@
 [firebird.driver]
-;
-; Firebird driver configuration.
+    ;
+    ; Firebird driver configuration.
 
-; Path to Firebird client library
-; Type: str
-;fb_client_library = <UNDEFINED>
+    ; Path to Firebird client library
+    ; Type: str
+    ;fb_client_library = <UNDEFINED>
 
-; BLOB size threshold. Bigger BLOB will be returned as stream BLOBs.
-; Type: int
-;stream_blob_threshold = 65536
+    ; BLOB size threshold. Bigger BLOB will be returned as stream BLOBs.
+    ; Type: int
+    ;stream_blob_threshold = 65536
 
-; Registered servers
-; Type: list of configuration section names
-servers = local,fb308,fb400rls,fb401rls,fb40,fb50
+    ; Registered servers
+    ; Type: list of configuration section names
+    servers = fb30old,fb308,fb30tmp,fb401,fb40old,fb40tmp,fb50,fb50tmp
 
-; Registered databases
-; Type: list of configuration section names
-;databases = 
+    ; Registered databases
+    ; Type: list of configuration section names
+    ;databases = 
+
+
+; ############################################################################
 
 [firebird.db.defaults]
-;
-; Default database configuration.
 
-; Name of server where database is located
-; Type: str
-;server = <UNDEFINED>
+    ;
+    ; Default database configuration.
 
-; Database connection string
-; Type: str
-;dsn = <UNDEFINED>
+    ; Name of server where database is located
+    ; Type: str
+    ;server = <UNDEFINED>
 
-; Database file specification or alias
-; Type: str
-;database = <UNDEFINED>
+    ; Database connection string
+    ; Type: str
+    ;dsn = <UNDEFINED>
 
-; Database filename should be passed in UTF8
-; Type: bool
-;utf8filename = <UNDEFINED>
+    ; Database file specification or alias
+    ; Type: str
+    ;database = <UNDEFINED>
 
-; Protocol to be used for database
-; Type: enum [xnet, inet, inet4, wnet]
-;protocol = <UNDEFINED>
+    ; Database filename should be passed in UTF8
+    ; Type: bool
+    ;utf8filename = <UNDEFINED>
 
-; Defaul user name
-; Type: str
-;user = <UNDEFINED>
+    ; Protocol to be used for database
+    ; Type: enum [xnet, inet, inet4, wnet]
+    ;protocol = <UNDEFINED>
 
-; Default user password
-; Type: str
-;password = <UNDEFINED>
+    ; Defaul user name
+    ; Type: str
+    ;user = <UNDEFINED>
+    ;user=SYSDBA
 
-; Use trusted authentication
-; Type: bool
-;trusted_auth = no
+    ; Default user password
+    ; Type: str
+    ;password = <UNDEFINED>
+    #password=masterkey
+    ;; Use trusted authentication
+    ; Type: bool
+    ;trusted_auth = no
 
-; User role
-; Type: str
-;role = <UNDEFINED>
+    ; User role
+    ; Type: str
+    ;role = <UNDEFINED>
 
-; Character set for database connection
-; Type: str
-;charset = <UNDEFINED>
+    ; Character set for database connection
+    ; Type: str
+    ;charset = <UNDEFINED>
 
-; SQL Dialect for database connection
-; Type: int
-;sql_dialect = 3
+    ; SQL Dialect for database connection
+    ; Type: int
+    ;sql_dialect = 3
 
-; Connection timeout
-; Type: int
-;timeout = <UNDEFINED>
+    ; Connection timeout
+    ; Type: int
+    ;timeout = <UNDEFINED>
 
-; Do not use linger for database connection
-; Type: bool
-;no_linger = <UNDEFINED>
+    ; Do not use linger for database connection
+    ; Type: bool
+    ;no_linger = <UNDEFINED>
 
-; Page cache size override for database connection
-; Type: int
-;cache_size = <UNDEFINED>
+    ; Page cache size override for database connection
+    ; Type: int
+    ;cache_size = <UNDEFINED>
 
-; Dummy packet interval
-; Type: int
-;dummy_packet_interval = <UNDEFINED>
+    ; Dummy packet interval
+    ; Type: int
+    ;dummy_packet_interval = <UNDEFINED>
 
-; Configuration override
-; Type: str
-;config = <UNDEFINED>
+    ; Configuration override
+    ; Type: str
+    ;config = <UNDEFINED>
 
-; List of authentication plugins override
-; Type: str
-;auth_plugin_list = <UNDEFINED>
+    ; List of authentication plugins override
+    ; Type: str
+    ;auth_plugin_list = <UNDEFINED>
 
-; Page size to be used for created database.
-; Type: int
-;page_size = <UNDEFINED>
+    ; Page size to be used for created database.
+    ; Type: int
+    ;page_size = <UNDEFINED>
 
-; Write mode for created database (True = sync, False = async)
-; Type: bool
-;forced_writes = <UNDEFINED>
+    ; Write mode for created database (True = sync, False = async)
+    ; Type: bool
+    ;forced_writes = <UNDEFINED>
 
-; Character set for created database
-; Type: str
-;db_charset = <UNDEFINED>
+    ; Character set for created database
+    ; Type: str
+    ;db_charset = <UNDEFINED>
 
-; SQL dialect for created database
-; Type: int
-;db_sql_dialect = <UNDEFINED>
+    ; SQL dialect for created database
+    ; Type: int
+    ;db_sql_dialect = <UNDEFINED>
 
-; Page cache size override for created database
-; Type: int
-;db_cache_size = <UNDEFINED>
+    ; Page cache size override for created database
+    ; Type: int
+    ;db_cache_size = <UNDEFINED>
 
-; Sweep interval for created database
-; Type: int
-;sweep_interval = <UNDEFINED>
+    ; Sweep interval for created database
+    ; Type: int
+    ;sweep_interval = <UNDEFINED>
 
-; Data page space usage for created database (True = reserve space, False = Use all space)
-; Type: bool
-;reserve_space = <UNDEFINED>
+    ; Data page space usage for created database (True = reserve space, False = Use all space)
+    ; Type: bool
+    ;reserve_space = <UNDEFINED>
+
+; ############################################################################
 
 [firebird.server.defaults]
-;
-; Default server configuration.
+    ;
+    ; Default server configuration.
 
-; Server host machine specification
-; Type: str
-;host = <UNDEFINED>
+    ; Server host machine specification
+    ; Type: str
+    ;host = <UNDEFINED>
 
-; Port used by Firebird server
-; Type: str
-;port = <UNDEFINED>
+    ; Port used by Firebird server
+    ; Type: str
+    ;port = <UNDEFINED>
 
-; Defaul user name
-; Type: str
-user = SYSDBA
+    ; Defaul user name
+    ; Type: str
+    ;user=SYSDBA
 
-; Default user password
-; Type: str
-password = masterkey
+    ; Default user password
+    ; Type: str
+    ;password=masterkey
 
-; Configuration override
-; Type: str
-;config = <UNDEFINED>
 
-; List of authentication plugins override
-; Type: str
-;auth_plugin_list = <UNDEFINED>
+    ; Configuration override
+    ; Type: str
+    ;config = <UNDEFINED>
 
-; Use trusted authentication
-; Type: bool
-;trusted_auth = no
+    ; List of authentication plugins override
+    ; Type: str
+    ;auth_plugin_list = <UNDEFINED>
 
-[local]
-;
-; Server configuration.
+    ; Use trusted authentication
+    ; Type: bool
+    ;trusted_auth = no
 
-; Server host machine specification
-; Type: str
-host = localhost
+    ; no helps...
+    ;ncoding = cp1251
+    ;encoding_errors = ignore
 
-; Port used by Firebird server
-; Type: str
-;port = <UNDEFINED>
+; ############################################################################
 
-; Defaul user name
-; Type: str
-user = SYSDBA
+[DEFAULT]
+    ; this section was added 20.07.2022, it was NOT in original file.
+    ; see letter from P.C. 28-dec-2021 15:14, subj:
+    ; "firebird-driver.conf: why some parameters can not be specified as COMMON for all tested servers ?"
 
-; Default user password
-; Type: str
-password = masterkey
+    host = localhost
+    user=SYSDBA
+    password=masterkey
+    encoding_errors = ignore
 
-; Configuration override
-; Type: str
-;config = <UNDEFINED>
+;[local]
+    ;
+    ; Server configuration.
 
-; List of authentication plugins override
-; Type: str
-;auth_plugin_list = <UNDEFINED>
+    ; Server host machine specification
+    ; Type: str
+    ;host = localhost
 
-; Use trusted authentication
-; Type: bool
-;trusted_auth = no
+    ; Port used by Firebird server
+    ; Type: str
+    ;port = <UNDEFINED>
+
+    ; Defaul user name
+    ; Type: str
+
+    ; Default user password
+    ; Type: str
+
+
+    ; Configuration override
+    ; Type: str
+    ;config = <UNDEFINED>
+
+    ; List of authentication plugins override
+    ; Type: str
+    ;auth_plugin_list = <UNDEFINED>
+
+    ; Use trusted authentication
+    ; Type: bool
+    ;trusted_auth = no
+
+; ############################################################################
+
+
+; Hereafter 'fb_client_library' must be specified in every server section.
+; NB: fb_client_library is part of DriverConfig and not server or database conf
+; Explanation see in:
+; 1. Letter from pcisar 28-dec-2021 15:14, subj: "firebird-driver-version"
+; 2. Letter from pcisar 07-mar-2022 21:30, subj: "firebird-qa [new framework]: unable to make connection as NON-ASCII user ..."
+[fb30old]
+    port = 3330
+    fb_client_library = D:\FB\fb30-old\fbclient.dll
 
 [fb308]
-; see letter from P.C. 28-dec-2021 15:14, subj: "firebird-driver-version"
+    port = 3308
+    fb_client_library = D:\FB\fb308\fbclient.dll
 
-host = localhost
-port = 3308
-fb_client_library = D:\FB\fb308\fbclient.dll
-user = SYSDBA
-password = masterkey
+[fb30tmp]
+    port = 3399
+    fb_client_library = D:\FB\fb30-tmp\fbclient.dll
 
-[fb400rls]
-; see letter from P.C. 28-dec-2021 15:14, subj: "firebird-driver-version"
+[fb401]
+    port = 3401
+    fb_client_library = D:\FB\fb401rls\fbclient.dll
 
-host = localhost
-port = 3400
-fb_client_library = D:\FB\fb40rls\fbclient.dll
-user = SYSDBA
-password = masterkey
+[fb40tmp]
+    port = 3499
+    fb_client_library = D:\FB\fb40-tmp\fbclient.dll
 
-
-[fb401rls]
-; see letter from P.C. 28-dec-2021 15:14, subj: "firebird-driver-version"
-
-host = localhost
-port = 3401
-fb_client_library = D:\FB\fb401rls\fbclient.dll
-user = SYSDBA
-password = masterkey
-encoding_errors = ignore
-
-
-[fb40]
-; see letter from P.C. 28-dec-2021 15:14, subj: "firebird-driver-version"
-
-host = localhost
-port = 3499
-fb_client_library = D:\FB\fb40\fbclient.dll
-user = SYSDBA
-password = masterkey
+[fb40old]
+    port = 3498
+    fb_client_library = D:\FB\fb40-old\fbclient.dll
 
 [fb50]
-; see letter from P.C. 28-dec-2021 15:14, subj: "firebird-driver-version"
+    port = 3500
+    fb_client_library = D:\FB\fb50\fbclient.dll
 
-host = localhost
-port = 3500
-fb_client_library = D:\FB\fb50\fbclient.dll
-user = SYSDBA
-password = masterkey
+[fb50tmp]
+    port = 3501
+    fb_client_library = D:\FB\fb50-tmp\fbclient.dll