Merge from iniju