Merge pull request #121041 from bruvzg/updlbl_at_fix