bb4a12914f
This commit and previous one should be backported to 2.79a should we release it.
This commit and previous one should be backported to 2.79a should we release it.