Merged changes with doddi