Clustering issues (GTNPORTAL-2982, GTNPORTAL-3042)