Backproted to 7.0, closing issue #2