Hello,

This patch could be cherry-picked into kirkstone, please?

Thanks ;)

Luis