Updating with version sniffing for OPTIONAL MATCH

Now this patch has version sniffing for OPTIONAL MATCH too.