TDI-30293: re-enable the fillConnectionInfo
Merge branch 'maintenance/5.6'