Merge branch 'next' into 'master'

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