[PDI-12374] - Following Jens Bleuel and Chantel Brathwaite's modifications
Merge pull request #578 from webdetails/PDI-12374

[PDI-12374] - Following Jens Bleuel and Chantel Brathwaite's modificatio...