Unread part of #579