Commit #378