Merge branch '5.x-dev' into 6.x-dev