Merge branch 'bug40828' into 'main'