Update for 21.40
This includes changes for 21.40, as well as the !1 (closed) merge request, which was merged internally already.
Edited by Jeremy Newton
This includes changes for 21.40, as well as the !1 (closed) merge request, which was merged internally already.