Merge branch '20854-more-v3' into dt-test