Merge "Fix issue with last auth entry" into udc-dev