Merged #289