Merge branch 'pt/credential-xdg' into next