new commit on hotfix

Change-Id: Iaf534ae0bc7766867248af9cf961d22ec9b13e9a
Merge branch 'hotfix/4.2.5' into develop

Change-Id: I89c882b04875773679dff39c0bda520bbc8464a8