Merge commit '058d5f2feb730846f22c1812e433f92f670ad751'