Fix wrong method calls
Merge pull request #1023 from xif6/wip-v2.4.0

[References] bux fix when getConfiguration is null
Merge pull request #1019 from sveriger/fix-xmldriver

Fix wrong method calls
Merge pull request #1 from Atlantic18/wip-v2.4.0

merge Wip v2.4.0