ESA: options for String resolving, began work on cache matrix
Merge remote-tracking branch 'upstream/sr' into sr2