Prepare for merge with main ADDIS repository