Done in order to take advantage of Nova tags support introduced in 2.26. Change-Id: I7fe68e624bf5c61cc854988457639bc6ae58d166