Merge "[DO NOT MERGE]Add check for slot index value" into pi-dev