Merge branch 'bug40566' into 'main'