Merge "Fix query lcc ops bug"