Commit #246