Merge "Get XCI_FLAVOR as parameter from the commit msg"