Merge from upstream into next

Signed-off-by: pyramid-X <rdxperiaz@gmail.com>