Including merge version
Resolving conflicts for fcardozo branch merge