Remove annotation
Merge branch 'hotfix/4239' into develop

Forward port #4239