Test on support branch

Change-Id: Ie4013c3cee9cf3df260a429fdee5ec4e1cd73908
Merge branch 'hotfix/4.2.8' into develop

Conflicts:
	newfile

Change-Id: I0837897515f23499033ceab13827b105e1ca8c91