Merge from Codiad