Bz 969223

Revamped pull request