Dev update of 1.4