ZEN-14514, ZEN-14515

Add tips to the doc