Merge "Adjust locks for byo-matrix Core CI scenario"