To issues #446, #493 (not finished)