Rebase #2063

Closes #2063
Closes #1083