GTNPORTAL-3037 Fix clustering