[gh-743] Closes
#654
#654 (closed)