-Fixed issue with Feedback fail never getting called.
Merge remote-tracking branch 'origin/master'