Backport which does not break the interface when switching from 0.13.0 to 0.13.1.
Github-Pull: #8581 Rebased-From: fab5ecb7719063aa72751df1258dfa4cf4a9a4a9
Backport which does not break the interface when switching from 0.13.0 to 0.13.1.
Github-Pull: #8581 Rebased-From: fab5ecb7719063aa72751df1258dfa4cf4a9a4a9
Github-Pull: #8581
Rebased-From: fab5ecb7719063aa72751df1258dfa4cf4a9a4a9
utACK