#1128, #1130, #1131

Signed-off-by: Carlos Escribano Rey <carlos@markhaus.com>