@lplotni TRUNK-287 Applied the changes.

As discussed with @dkayiwa