Ripple vertical fix

Note:  Do not merge until after #731.  To reduce conflicts, I based this branch on that PR.