Merge branch 'bug40834' into 'main'