Update branch from shinji62 repos