Merge branch 'ph/credential-gnome-keyring' into next