part of #1236