subscription hot
merged trunk
canceldate added
2.6 work in progress
matching
2.6 work in progress - optimize