Merge branch 'bug40911' into 'main'