request retry policy & visibility fix