Trunk 3448

Hi Daniel,
Please find the new pull request for ticket Trunk-3448
- Milinda