Fix empty folder creation & bump to 2.3