Reviewed-by: martin, iris
Contributed-by: NSergey Kuksenko &lt;sergey.kuksenko@oracle.com&gt;, Brian Burkhalter &lt;brian.burkhalter@oracle.com&gt;, Dmitry Nadezhin &lt;dmitry.nadezhin@oracle.com&gt;, Olivier Lagneau <olivier.lagneau@oracle.com>