#508: #137: first pass; more to do
opened by thuchacz