Merge commit 'v1.6.3.2' into devel