Merge commit '08511cda390e0057ca3ffaf193aeeb5ce74262fc' into rebase_264688