DDBNEXT-1506: post review fix