Merge tag 'v5.10.40' into v5.10/standard/base

This is the 5.10.40 stable release

# gpg: Signature made Wed 26 May 2021 06:13:39 AM EDT
# gpg:                using RSA key 647F28654894E3BD457199BE38DBBDC86092693E
# gpg: Can't check signature: No public key