Update for v1.5.9 and v1.6.3. Fixes.