Merge commit '29ce831000081dd757d3116bf774aafffc4b6b20' into next