Merge remote-tracking branch 'origin/anehmer/restapi' into dev