- applied upstream on version 1.20.0