Update 1.5.2 with latest master changes

Yeah we need to figure out a better workflow