Upstream update 20.22.2014