bugfix 1 fixed

Change-Id: Id90ec0db1efc5896c5da85df2af23536e6715e6c
Merge remote-tracking branch 'origin/bugfix_1'