Merge "BUG 1623 - Clustering : Parsing Error thrown on startup"