This implementation does not create new methods in API, hence it can be backported. (cherry picked from commit 294ce778)