BACKLOG-4576 : fix definition issue
Merge remote-tracking branch 'origin/master'