Merge "Use System property to get the slot count"