Commit #345