Merged #322.