Created by: hnrch02
See #13929 (closed) and also #13855.
Adds two unit tests for this as well.
/cc @fat