Fix intendation and adapt for unstable subfolder
Set to true ready for 3.1.0-a1