Signed-off-by: Rafael Fonseca <r4f4rfs@gmail.com> Closes: #1797 Approved by: cgwalters
Closes: #1770 Closes: #1787 Approved by: jlebon