Merge branch 'ps/plug-xdl-merge-leak' into maint