Merge "Add check key only if there is at least one check"