Merge "Update to allow more flexible descriptions." into pi-dev