Hotfix/1.6.14

* fixes misplacement of clusters [#508]
* fixes clashes between keyIds of clusters of count 1 [#509]
* fixes possible clash between cluster keyId and locale keyId [#510]