Merge "Configure synci generation explicitly"