Ajay | #3903 | Bugfix - fixed message and transalation
Merge branch '15_0_release' into develop