[gh-712] Closes
#707
#707 (closed)