Ensured that ding entity exists before calling it
Merge remote-tracking branch 'origin' into release