Merge branch 'support/test_helpers' into 'develop'