Merge "Add keywords to Slices" into pi-dev