Merge "Fix FDE" into pi-dev