TRUNK-3902 Resolved. Please review.