Merge pull request #14665 from peter-stadler/uacme