Merge branch 'jani-rest' into docs-next