/
Fixing issues after migration / update / upgrade to v6.4.0

Fixing issues after migration / update / upgrade to v6.4.0