Used also in mistral-extra so let move it to here Change-Id: Ifa60374818ff3fe6da649d04c84c832b313e90d7