AG-3516: values tuned