[3.8] Fix #1487 : Fix feedback request messages