Merge "Conf: Add sparse check support"