API surrogacy bugfix
Merge branch 'my'