Merge "Add include on restore state to init"