bug-1062
Merge remote-tracking branch 'origin/staging'