Readded hotbuild preview + cleanups
update to 1.38