Improves configuration load for ThunderGate (#425).
Merge remote-tracking branch 'private/issue/425' into 0.7-develop