Merge "Uniquely identify Slice intents" into pi-dev