requested review from @giadarol and @rdemaria
assigned to @fsoubele
merged
mentioned in commit 5437fea8