Merge DEV-JO + Dev2