api fix for issue #291

api fix for issue #291
api fix for issue #291

api fix for issue #291
Merge remote-tracking branch 'origin/dev' into ci