Backend updates merge

Merged the backend update from branch 'niek'.