API
Merge branch 'ftr-696' into devel
Merge branch 'devel'