Merge improvements from de-DE to de-AT