Depends on the following bugs:
2093196
2099102
2099130