Fixed issue #2304 adding support for alter class .. clusterselection
Fixed issue #2348
Fixed issue #2344