Re-open #617 against dev branch