Sorry, I forgot checking the PR base before submitting my report. However the person(s) taking care of the original PR should look at my duplicate PR bin/68853 because the patch I worked out is much smaller (due to reuse of a existing function) and might therefore be useful.