Merge pull request #524 from klcodanr/elastic-function-support