Resolve "rewrite API"

Placeholder Piotr Gawronrequested to merge
1594-rewrite-api into development

Closes #1594 (closed), #846 (closed)

Edited by Placeholder Piotr Gawron

Merge request reports