Commit #347