in progress -- #700, #795 and #850