Bug 123456
Bug 321312
Merge branch 'release-1.0.0' into develop