bug 1077595 -- With fixed unit test. a=testonly
Merge pull request #26423 from nullaus/v2.0

bug 1077595 -- With fixed unit test. a=testonly