Fix tooltip appearance
Merge branch 'DDBNEXT-1302-BOZ-v2' into develop