Merge "Allow to update restart period dynamically." into tm-dev