Merge "Codec2Cient: Do not hold lock during IGBP operations" into main