Add 1.4.0 final changes, new Hammer changes