Comment From: eleftherias

Relates to gh-11075

Comment From: eleftherias

Closed via cb2291c