Update to upstream version 4.94