Integrated issue #6