Fixing issue #344.
Fixing issue #343.
Fixing issue #342.
Updating cache.
Moving Faction.
Merge branch 'hotfix/1.6.1' into develop