Merged lcobucci and zigolis changes