[#46718781] fixes