* #3137 add the leftover code from #3138 for fixing issue #3137 * #3239 Use slice id as the key instead of sliceName