backported 2775dc2b443fc8abc3ae0a659c3a8a800ab90035
5.5.17