AI-843 : fixed regressions after moving to EnumValue
AI-843 : reverts accidently send changes to GetSitesHandler
Merge remote-tracking branch 'origin/beta' into beta