add back previously removed variation test cases on #3127
Merge remote-tracking branch 'origin/staging' into staging