closes #1018 (closed)
requested review from @erwanrouchet
assigned to @mlbonhomme
mentioned in commit 6ea4d457
merged