Fix LP: #1186634

Fixes all bugs concerning incomplete resets