Merge "Add system property to disable BIC" into main