fix: apply fixes from 3.0.1 and 3.0.2 branches
Fixes copied from 3.0.1-patch-branch and 3.0.2-patch-branch.
Two small fixes (!1143 (d0a89c3c) and !1143 (0ace9dc5)) are separately included in !1143 (merged), so I have not repeated them here.
Fixes copied from 3.0.1-patch-branch and 3.0.2-patch-branch.
Two small fixes (!1143 (d0a89c3c) and !1143 (0ace9dc5)) are separately included in !1143 (merged), so I have not repeated them here.