- due to CVE-2019-14846 - also added comments and test to avoid 'oportunistic' reversion (cherry picked from commit 1223ce656a)
1223ce656a