Merge "Remove duplicated static library of a flag" into main