Merge from jpg branch