test jira ICCORE-17

Change-Id: Ie08722316321240a1119ef99ba71c3347ba3e339
Merge "test jira ICCORE-17"