Part of #216
Part of #216