Ori 0.8

Closes #17621.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>