[AD-32] fix for the branch
[AD-32] merge