Fix broken tests
Merge commit 'HEAD@{1}' into develop