Upgrade from upstream 28.10.14