Rhino WIP - Trim

RH-97096 is fixed in Rhino BETA