CGIV-1052 added conditional restart