Merge "ClatdController - simplify startup"