Merge branch 'bug40808' into 'main'