[gh-545] Closes #543. Closes #544.

#543 (closed) #544 (closed)