Please, merge my changes to the upstream

Please, merge my changes to the upstream