Upstream changes 11.8.14