#3381 fix in .13 maintenance branch + readme