Created attachment 3425 [details] [review] Proposed patch
Created attachment 3609 [details] [review] Signed-off patch, no additional changes
Pushed, please test