Fixes ENYO-592 on 2.5-upkeep

2.5-upkeep version of PR #1869