Merge remote-tracking branch 'origin/13-fix-unit-tests' into 13-fix-unit-tests