Merged #405.