Merge subset of commit '4a6ca9e91e82da3047bd0029296e00e9030a3686' of git://github...