Merge branch 'rb/no-dev-zero-in-test'