Merge commit 'v1.6.3.1' into devel