Issue #2381727 by djdevin: User incorrectly sent to next question when last question is a non-feedback question