Merge DEV-JO & Dev2 to 1.4b