Feedback UI changes see BT#9017