Upgrade to upstream v1.3.240