master: 35802a87872426b6ea07051551ab1bb042115204 Make changes provided by client