* Moved workaround for #451 to first possible position main of client.
Merge origin/master