Manually merge #522 from @qzix13