Various 164 backports