Merge "Fix conditional check bug." into main