Towards #1283
Towards #1283