8abb7032b7ef035947787380677bfeae809c9ac5 fixes-210420.patch