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

...ns