Commit #339