Solution for Trunk-4283