Merged #278