Issue #26.
Issue #32, Issue #33, Issue #37.