This patch removes the use of expanduser and replaces it with type 'path' for the option. This is related to #12263.