Merge "TIF: Change the directory of the state file" into lmp-dev