Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint