BZ-10418 Added auto refresh