merged gh-1080 with staging
merged gh-1080 with staging