Squashed commit of the following: Author: Marco Platania <platania@research.att.com> Signed-off-by: Marco Platania <platania@research.att.com> Author: Marco Platania <platania@research.att.com> Signed-off-by: Marco Platania <platania@research.att.com> Author: Marco Platania <platania@research.att.com> Signed-off-by: Marco Platania <platania@research.att.com> Signed-off-by: Marco Platania <platania@research.att.com>