Merge pull request #3873 from maxonfjvipon/bug/#3872/expand-aliases-p…

Merge pull request #3873 from maxonfjvipon/bug/#3872/expand-aliases-p… #6905