sprt merge from upstream
Release 3.0.57