abc-10

Change-Id: I214bc8b0bf5a2a7b85ca6719e64d00ddb638aba4
abc-11

Change-Id: I760f46d7a0805737da3568623b562d53abce93d5
Merge branch 'hotfix/3.4.1' into develop

Change-Id: Ie64af6c2e61beb84b46cc7a0faf11a6f6380caf1