Break infinite loop while resolving aliases
bug #12316 Break infinite loop while resolving aliases (chx)

This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #12316).

Discussion
----------

Break infinite loop while resolving aliases

| Q             | A
| ------------- | ---
| Bug fix?      | [yes]
| New feature?  | [no]
| BC breaks?    | [no]
| Deprecations? | [no]
| Tests pass?   | [yes]
| Fixed tickets | []
| License       | MIT
| Doc PR        | []

Commits
-------

acbde50 Break infinite loop while resolving aliases