Merge from unstable
Swift file explorer now compiling and working