TRUNK-3884 Resolved and tested successfully.