Merge "Extend linux.user"