<DA-389> fix overriten problem
<unstable> Merge branch 'DA-389' into unstable