Merge "Add linux.system.directory state"