manual backport of fixes from master.  Rename to -dev so they remain separate
Rename LateNight-Stacked folder