fec-1112 fix bumper entryId
Merge remote-tracking branch 'origin/2.5-March-23' into 2.5-March-23