Build 5.2.0.1596

Bugfix