Following discussion in the pr #4629
Following discussion in the pr #4629