Merge "Fix checking on wrong variable causing CTS fail issue." into main