Merged #443.