Merge "Change supervisor settings constants to int." into tm-dev