merged branch newActive

Signed-off-by: Marco Milanesio <milanesio.marco@gmail.com>