Upgrade from upstream 26.09.14