Merge "Added slot id in the internal API"