Co-authored-by: Werner Fleischer <70745309+wernf@users.noreply.github.com>
mentioned in commit a8868010