CON-1489

Fixed in #5121