Hi folks! I've tested this change and it works #7944. And the changes are simple enough and make sense.