Conflict caused by the implementation of this #1236 was solved.