ENYO-345 (master)

Cherry-picking from `2.5.1-release` into `master`, creating PR for tracking purposes.