Update the changes from GateIn 3.5 final