Plowshare 3.GIT-c289008

Closes #20396.

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