Merge "BUG 2676 : Use custom client-dispatcher when configured"