Merge pull request #3604 from opdenkamp/api-1.9.0