Solution for Trunk-4139