Fixes PR13655
Fixing PR13657
A few links