Merge branch 'dl/credential-cache-socket-in-xdg-cache' into maint