Note, new implementation will be applied for new clusters only. Old implementation will be applied if user scales cluster created in Icehouse.