Proposal for issue #3