Merge "Fix for invalid CNF release name" into guilin