[AD-32] fix for the branch