backport test to staging