DEVELOPER-819 In sync with upstream
DEVELOPER-819 In sync with upstream