Merge branch 'hotfix/123'
Merge branch 'release/3.4' into master
Merge branch 'release/4.0' into master
Merge branch 'release/4.2' into master
abc-8

Change-Id: I2d673ab76b4703c573c82454b8c59843239f4ac5
Merge branch 'hotfix/4.2.1' into develop