TRUNK-3751 Fixed