new commit

Change-Id: I5cba557f352310d025cc235ff9b8ee2f79c4e784
Merge branch 'hotfix/4.2.4' into develop