Merged #385