Closes #1730 Continues #8664 This is my attempt to apply the changes of #4718 to the PR.