Merged changed from fwbrasil